Merge "Fix work tab accessbility issues." into main