Merge "Improve system gesture listener to handle display cutout"