Merge "Refactor CaptionAppearanceFragment to improve maintainability (5/n)"