Merge "Fix captions settings UI"