Merge "Merge "ViewRootImpl: Call surface destroy callback after layout pass" into rvc-dev am: 276abcb6b3 am: f5727d3efd" into rvc-d1-dev-plus-aosp