Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev am: d1f55f6302
am: 8fee9425e4

Change-Id: I0e88c75cea5b39aadd829470c1b299cf10444e5a