Merge "Manually apply "hide capture more" change to main" into main