Merge "Fix bug where Keyguard's emergencydialer wasn't being launched with a userid." into jb-mr2-dev