Merge "Hide KeyguardMessageArea if empty" into mnc-dev