Merge "Change data type of surface id" into tizen