Merge "Fixing work tab is not updated when work-mode changes" into tm-qpr-dev