Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev