Merge "Minor fixes handling START_USER_SWITCH_UI_MSG:"