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

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