Merge "DO NOT MERGE Allow keyguard_message_area_container to be null" into sc-v2-dev