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

* commit '256b1ac1464d2914bf14f5706c474eeaedaa4f97':
  Revert "Fix name-suffix crash on rotation"