am ac3ef9db: am 9c673b05: Merge "Go back to keyguard if user is switched in...
am ac3ef9db: am 9c673b05: Merge "Go back to keyguard if user is switched in lock screen" into jb-mr1-dev
* commit 'ac3ef9db':
Go back to keyguard if user is switched in lock screen