Merge "Reapply insets normalization on configuration changes" into main