Merge "Change volume ringer icon based on device config" into tm-qpr-dev