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

* commit '608e919b3d82faaec21c9e6e6a8bd47c150504fb':
  Make Dismiss Icon under Cards show up only when focused.

Change-Id: Id61875edea2b596f13dc7938e85ae85462673428