Merge "Fix contacts_unavailable_container layout" into lmp-dev