Merge "[Work profile]  Fix flickering work mode switch" into sc-v2-dev