Merge "Update remove_capture_display flag to read-only." into main