Merge "Update captioning settings to match revised API" into klp-dev