Merge "Fix ClearKey session leaks" into rvc-dev