Merge "Don't attempt to convert degree to orientation enum twice"