am 132eedfc: Merge "Add setting for configuring zoom level on double-tap." into ics-mr0

* commit '132eedfc1cf97456cf03d55968bed4bc9e4eb817':
  Add setting for configuring zoom level on double-tap.