Merge "Introduce getChildSurfacePackage() and clearChildSurfacePackage()" into main