Merge "Fix wrong highlighted personal | work tab" into sc-dev