Merge "Skip surface placement if the given insets will not change" into main