Merge "Do not re-inflate QS and SB when CONFIG_UI_MODE" into sc-dev