Merge "Use FalsingManager for QS user switcher" into sc-dev