Merge "Merge "ViewRootImpl: Call surface destroy callback after layout pass" into rvc-dev am: 276abcb6b3 am: 15f0a2590a am: 0238551d6d" into rvc-qpr-dev-plus-aosp