Merge "Fix rotation animation selection." into oc-dev