Merge "Bug 3352047 Wrong message when adjusting volume"