Merge "Allow keyguard_message_area_container to be null"