Merge "Revert "Animate activity when launching over keyguard""