Merge "Surface.java: decrease native allocation size" into main