Merge "Revert "Reparent bounds layer if surface was replaced."" into rvc-d1-dev