Merge "[Output Switcher] Modify ranking rule" into tm-dev