Merge "Put the affordance launch animation back on the renderthread" into...
Merge "Put the affordance launch animation back on the renderthread" into nyc-mr1-dev am: 00a6c297 am: cb140ad8
am: 6cee0087
Change-Id: I78feec3bf98e84af7351acbd88187eb1bfd0269a