Merge "Fix sound settings affinity"