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

* commit 'badac04dfd445a1fd3e3ecea04815e83fad5226c':
  Add some free zoom to lockHardwareCanvas