Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev