Merge "Misc fixes to TTS settings."