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