Merge "Fix flaky uncropped_container_replaces_touchable_region_with_null_crop" into main