am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb

* commit 'debb5bbe816ce764ecda73eabc17c31fd59fbe3e':
  Add public API for on screen zoom controls