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

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