Merge "1/ Make One handed mode support multiple user switch" into sc-dev