Merge "Hide the audio switcher if it is not relevant" into pi-dev