Merge "Prevent crash when on UserSwitcherActivity rotate" into tm-qpr-dev