Merge "Remove BroadcastReceiver ref on unregister"