Merge "Ring volume icon stuck at normal" into tm-qpr-dev