Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev