Merge "DO NOT MERGE - Disabled swiping in Grid-based Recents." into nyc-mr2-dev
am: b9606a5d09

Change-Id: I3888fc06f40661f73689a71b3db83a52ccbb7c89