Merge "Fixed a flashing when the affordances were launched" into nyc-dev am:...
Merge "Fixed a flashing when the affordances were launched" into nyc-dev am: a56e732c am: bdfa6d9f
am: 9a18887e
* commit '9a18887e':
Fixed a flashing when the affordances were launched
Change-Id: If57609120976df4db1b9b58c48d2a304c878071d