Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev...
Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev am: 6efc5dcb am: 0565aa24
am: f60fd461
* commit 'f60fd461':
Make Dismiss Icon under Cards show up only when focused.
Change-Id: I987a79a33912625d08146382cba0d555299d32ee