Merge "Adding insets to prevent back gesture from triggering status bar" into main