Merge "Restore default locale in Captioning Settings" into klp-dev