Merge "Fix to allow setting URI without recreating ringtone" into tm-qpr-dev