Merge "Delete the separate grid recents activity and related code"