Merge "Update statusbar insets when switching displays" into sc-v2-dev