Merge "Framework changes to support new TTS settings features."