Merge "Calls cancel on mDimAnimator to ensure that ref counts are accurate." into oc-dev am: e6b55b99 am: a0778857 Change-Id: Ia20405b22319dd665305b87c095a016b60cf2a91