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

Change-Id: I85a8c69432dc1be728e5bc0f8ca2dde586cd66aa