Merge "Minor change for CaptionAppearanceFragment"