Merge "Revert "Correctly play the ringtone set by secondary users"" into nyc-dev