Merge "Identify cast mode properly in audio switch" into pi-dev