Merge "Make --no-window-animation flag apply to animators, too" into oc-dev am: c36e3e7f am: 972734f5 am: 47010504 Change-Id: Iabf6f31f4bf9c3e7ed382d19ac2c93c29fbd2651