Merge "Separate notification/ring volume sliders in UI" into tm-qpr-dev