Merge "Fix ui_mode change have not schedule configuration change to client" into sc-dev