Merge commit '23d153cf0d17762cee81984b7adf2009a40dc5c6' * commit '23d153cf0d17762cee81984b7adf2009a40dc5c6': Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."