Merge "Extract common codes for personal / work profile tabs" into sc-dev