Merge "Reduce long press timeout on edge back gesture" into qt-dev
am: 4b4a138f16

Change-Id: I0364d62013490d1453e9598cf6bdc3d9ff103a50