Merge "Fix several flaky DeviceStateManagerServiceTests" into main