Merge "Templatized TextSwitcher" into developers-dev