Merge "Clipping before keyguard dismiss animation occurs"