Merge change 9601

* changes:
  Make ZoomButtonsController public.