Merge "[Unicast] Won't show "active" when changing active from HS to LEHS" into tm-qpr-dev