Merge "Merge "Reparent bounds layer if surface was replaced." into rvc-dev am: ab3d80c98d am: fa48a156c7 am: f3f9ce3148" into rvc-qpr-dev-plus-aosp