Merge "Fix issue 4499450: Unknown Ringer Mode"