Merge "Rename and improve remote volume controller related methods"