Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev