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