Merge "Merge "[Work] Fix duplicate work button issue" into sc-v2-dev am: 966e0507d6 am: 5e3818e333"