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