Merge "[Output Switcher] Not using advanced icon for bt device" into tm-dev