Merge "Fix the issue widget retore doesn't play well with work profile" into tm-dev