Add back device motion to re-test prod