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

Change-Id: I4779532a0be4e8a821e521d1b962b4c57ecf86b8