Merge "Add keyboard support to Grid-based Recents." into nyc-mr2-dev
am: 2a147464f6

Change-Id: I24436e76caa536f1d2e873b544fc12a2c1478f36