Merge "Second pass on Keyguard multi-user switcher" into jb-mr1-dev