Merge "Switch ringtone looping to use MediaPlayer looping."