Merge "Move keyguard multi-user icon into container view" into sc-v2-dev