Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev