Merge "Remove fix_no_container_update_without_resize flag" into main