Merge "Merge "Settings: Fix leak of BroadcastReceiver intents" am: 3499af28 am: 1b4a0abd am: 517b35fa am: d2ff3244"