Merge "Go back to keyguard if user is switched in lock screen" into jb-mr1-dev