Merge "Also check with mOverrideConfigTypes in providesDisplayDecorInsets" into main