Merge "BroadcastReceiver refactoring"