am f37b20e1: Merge "Fix \'always\' preferred app assignment" into lmp-mr1-dev

* commit 'f37b20e1aa03fe662e7cef8e6aee2ded9ea5e514':
  Fix 'always' preferred app assignment