Merge "Also Skip DRM setup on devices that don't have DRM" into klp-modular-dev