Merge "Don't reset the keyguard on occlusion if it's going away." into tm-d1-dev