Merge "Settings: Fix leak of BroadcastReceiver intents"
am: 3499af28c4

Change-Id: I2b0f3920f39981956d25017999a25799d995252b