Merge "[Notification Content Cut Off] use max child height in ConversationLayout" into main