Merge "Merge "ViewRootImpl: Call surface destroy callback after layout pass" into rvc-dev am: 276abcb6 am: 15f0a259 am: 0238551d" into rvc-qpr-dev-plus-aosp