Merge "Put the affordance launch animation back on the renderthread" into nyc-mr1-dev
am: 00a6c2979b

Change-Id: I2430bd0bee50ed7087c59b1ebce873e3094d5451