Merge "Change DimAnimator to reflect rotations." into jb-dev