am 6cb69c7d: Merge change I8b302097 into eclair-mr2

Merge commit '6cb69c7d7496943cec7913a3a7ffab7f6d75e584' into eclair-mr2-plus-aosp

* commit '6cb69c7d7496943cec7913a3a7ffab7f6d75e584':
  Update the zoom buttons after moving to a new page.