Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev