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

Change-Id: I07bc5ebe342951591c6c08ee9769d5cfd8277034