Merge commit '1305547fc59120b281609f7d68d8ff21af66df5a' * commit '1305547fc59120b281609f7d68d8ff21af66df5a': Don't activate keyguard if screen is turned off while proximity sensor is active.