* changes: Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."