Merge "Update DeviceState for GTS fixes." into sc-dev