Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev