Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev