Merge "Replace preference with remote media preference group in xml"