Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev
am: 6efc5dcb27

* commit '6efc5dcb274d08ba7dc812c90089bc10a38b890e':
  Make Dismiss Icon under Cards show up only when focused.

Change-Id: Icf9af6b8c7dffffdc1d3a939049b9b764ccb6e9d