Merge "Consistent KeyguardStatusView alpha"