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

* commit '4a7967ad9ac76d8b9d6285bc367c33d1b6c83235':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display