Merge "Fix sorting issues with remote and resume controls" into sc-v2-dev