Merge "[Build Blocking] Fix conflicting resource IDs for work tab" into sc-dev