Merge "DO NOT MERGE - Delete the separate grid recents activity and related...
Merge "DO NOT MERGE - Delete the separate grid recents activity and related code" into nyc-mr2-dev am: 09c0fdca
am: ceebe36a -s ours
Change-Id: Iaad62a9f61be795b774935a8001309542a4349ea