Merge "[Work] Fix duplicate work button issue" into sc-qpr1-dev