Merge "Making KeyguardView slippery fixes 5501105"