Merge "Fix the device on "Media devices" not updated issue" into rvc-qpr-dev