Merge "Put the affordance launch animation back on the renderthread" into nyc-mr1-dev