am c9b05bf4: Merge "Fix the zoom control bar UI on phone." into ics-factoryrom

* commit 'c9b05bf45bdefe34c2d5591fef3224dd2049461c':
  Fix the zoom control bar UI on phone.