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

Change-Id: Idbb3916a129b4c381d225a7fd84d4e311abe11ef