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

Change-Id: I78feec3bf98e84af7351acbd88187eb1bfd0269a