Merge "Revert DeviceState callback to main thread in FFP." into main