Merge "Correct reporting of errors in MediaCrypto"