Merge "Add audio switch UI in sound settings" into pi-dev