Merge "Eliminate potential for NPE in WindowAnimator." into jb-mr1-dev