Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev