Merge "Standardize the surface origin for each HWUI pipeline."