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