Merge "Update DimAnimator layer when its window changes." into jb-dev