am 93f39bb8: am c96ca752: Merge "Fix name-suffix crash on rotation" into lmp-dev

* commit '93f39bb8b7bb456b9ee77ee042d742bcd5dd5ff8':
  Fix name-suffix crash on rotation