Merge "Remove special logic for top/bottom gesture insets" into sc-dev