Merge "Fix crash when TestingSettingsBroadcastReceiver handling intent"