Merge "Refactor CaptionPropertiesFragment to improve maintainability"