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

* commit 'c96ca7524290fe747c78cc9104bd433f042ca85a':
  Fix name-suffix crash on rotation