Merge "get rid of Surface.getIdentity()"