Merge "Reset the pip icon overlay scale and offset" into main