Merge "media: update on concurrent codec usage" into udc-dev