Merge "Clean up DRM handling"