am 19ce778a: am 256b1ac1: Merge "Revert "Fix name-suffix crash on rotation"" into lmp-dev

* commit '19ce778ad88bcc02a0c9dfe2975ab52eaa54f1bf':
  Revert "Fix name-suffix crash on rotation"