Merge change I77153ee0 into eclair

* changes:
  Hide zoom api.