Merge "[Notification Content Cut Off] Messaging child requestLayout" into main