Merge "Move SettingObserver#setListening out of frequent path" into tm-dev