Merge "change Surface constructor arg to 64bit"