Merge commit '589cebe2d58591403de4a77077941c0454bc91bc' * commit '589cebe2d58591403de4a77077941c0454bc91bc': * Use the scaled size for surface view instead of native. The surface will be always scaled
Merge commit '589cebe2d58591403de4a77077941c0454bc91bc' * commit '589cebe2d58591403de4a77077941c0454bc91bc': * Use the scaled size for surface view instead of native. The surface will be always scaled