Merge "Introduce movable cutout feature flag" into main