Merge "Settings: Fix leak of BroadcastReceiver intents"