am 48d6a96b: (-s ours) am fce4220b: am 5fd6b139: am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev
* commit '48d6a96b':
[DO NOT MERGE] Fixed NPE when trying to animate a window without display