Merge "Do not update surface for dummy animation as long as transition is set"...
Merge "Do not update surface for dummy animation as long as transition is set" into nyc-dev am: 5b7a097b
am: 31fd5681
* commit '31fd5681':
Change-Id: Icd135dee433d5ae7f6b8afc738ac0aac704766b9