Merge "Move keyguard multi-user icon into container view"