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