Merge "Add secure settings for captions"