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