Merge "Adds a drm resource busy error, removes some deprecated errors"