Merge "Make MediaDrm device-aware" into main