Merge "Fixed a flashing when the affordances were launched" into nyc-dev
am: a56e732c01

* commit 'a56e732c01f10ebd27185a66ee4330f50c8cd57b':
  Fixed a flashing when the affordances were launched

Change-Id: I0a03111befb2e5136aac2d07f1b07af4131aaf6c