Merge commit 'd1fc1c077b96b1f7f7a58318bd2fc2449315ed84' * commit 'd1fc1c077b96b1f7f7a58318bd2fc2449315ed84': Do not show keyguard if screen is turned off by proximity sensor.