Merge "Fix for the occasional prepareDrm/releaseDrm deadlock"