Merge "Fix broken KeyguardMessageArea"