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