Merge "Update the string of both magnification settings and gesture navigation...
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e49
am: d2fa1e6b
Change-Id: Id64aadc20751d107c93b32a420d679aa2cc9a72b