Merge "Remove lock on MediaCrypto's decrypt call" into sc-dev