Merge "Used BroadcastReceiver to monitor mode changes"