Merge "Improve error handling for DRM errors reported by plugins" into jb-mr2-dev