Merge "Make --no-window-animation flag apply to animators, too" into oc-dev am: c36e3e7fff
am: 972734f592

Change-Id: I02666e4918b849cf4bcc119a61b4b693825dabe2