Merge "Add falsing check to MultiUserSwitch" into sc-dev