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