Merge changes If4a471e2,I5ed1713d into main

* changes:
  [Temp bonding] Clean up old guest device logic as requirements changed
  [Temp bonding] Move audio sharing settings up