Merge "Implement focus state on personal/work tab button" into main