Merge "Preserve the local insets even when the display changes." into main