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
automerge: ab52a9da -s ours
* commit 'ab52a9da':
[DO NOT MERGE] Fixed NPE when trying to animate a window without display