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

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