Merge "Merge "Update the edge back gesture width from the current user's overlays" into qt-dev am: 4cdce5a874 am: 37820e6e08" into qt-r1-dev-plus-aosp