I've provided a v2 version of the patch that includes the reasoning behind the change and a small note that won't be included in the patch regarding core-image-sato, which has a similar problem.

Both images can not be built without providing a distro, with REQUIRED_DISTRO_FEATURES and features_check, the build fails with a more clear error.