Merge "Stay registered to proximity sensor while activities are occluding keyguard" into main