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