Merge "Fix BroadcastReceiver leakage"