am ad0acf1d: am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev

* commit 'ad0acf1d104988238f431d874f0ecf9917a06699':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.