Merge "Fix 'always' preferred app assignment" into lmp-mr1-dev