Merge "[Settings] Try to reduce the time pending on BroadcastReceiver"