Merge "DO NOT MERGE - Delete the separate grid recents activity and related code am: e93f8100a6 am: 15b6c78534  -s ours"