Merge "Merge "Reparent bounds layer if surface was replaced." into rvc-dev am: ab3d80c9 am: fa48a156 am: f3f9ce31" into rvc-qpr-dev-plus-aosp