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