Merge "Unregister broadcast receiver before registering it again." into 24D1-dev