Merge "2D recents: show all close buttons right away" into nyc-mr2-dev
am: 3b430f7d0c

Change-Id: I816b8170fef81e02d2c9fc99ba0f236d7f2cf080