Merge "Revert^2 "Migrate WristOrientationService"" into main