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

Change-Id: I71e7aebdb910a98c9125cd00787f60526b158d39