Merge "Calls cancel on mDimAnimator to ensure that ref counts are accurate." into oc-dev