Merge "get rid of Surface identity and token"