Merge "Update context on resume calls for BluetoothAdvertisingEnabler and BluetoothEnabler"