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

Change-Id: Icfe7bcdbcfc5d4799b505182674c38845ae10faf