Merge "Adds tests for device state flags in DeviceStateProvider" into sc-v2-dev