Merge "Cleans up old user switcher impl. and flags." into tm-qpr-dev