Merge "Fix window insets for settings activities" into nyc-dev