Merge "Merge "Reparent bounds layer if surface was replaced." into rvc-dev am: ab3d80c98d am: 2b66979876" into rvc-d1-dev-plus-aosp