Merge "Fix keyguard dismiss animation with occludable activities." into tm-qpr-dev