Merge "[Output Switcher] Adjust check for advanced icon" into tm-qpr-dev