Merge "Make fullscreen caption the size of the caption handle" into main