Merge "Revert "Create QS media player setting"" into rvc-dev