Merge change 21652 into donut

* changes:
  Make ZoomButtonsController public.