Merge "Update main toggle state in User Settings onResume()" into main