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