am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to...
am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev
* commit '4a7967ad':
[DO NOT MERGE] Fixed NPE when trying to animate a window without display