Merge "Fix CodeInspectionTest for CaptionPropertiesFragment"