Merge "Fix alpha animation bug in keyguard"