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