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

* commit '974d7a852d5e1d0a09fe8b43f946cf900c126672':
  Revert "Fix name-suffix crash on rotation"