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