Selecting 6.2 or 6.3 target in project wizard has 5.15.4 kit selected by default when project opens

This is on local build, I haven't tried if snapshots do this as well. Presumably happens because of change e2f20ddcd5f515d39d1eb5ae0d13b766ddfa73b6.

I have 6.3.0 kit set as default in settings, so it is actively choosing this wrong kit over the default.