Merge "Revert "Migrate WristOrientationService"" into main