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