Merge "[RESTRICT AUTOMERGE] Messaging child requestLayout" into 24D1-dev