Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev