am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev
automerge: ab52a9d -s ours
* commit 'ab52a9daa310209b27a57b61aadc704b76712c02':
[DO NOT MERGE] Fixed NPE when trying to animate a window without display
This commit is contained in: