Merge "Resolve Flaky work tab tests"