Merge "Migrate from old key when combining device and media data" into rvc-qpr-dev