Merge "Fix Caption Handle Disappearance" into main