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