Merge "Fix incorrect system gesture insets reported when there are cutout areas on the left/right edges of the display"