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

* commit '51ed6165b78c821dde22df911b40368413d8de14':
  Fix name-suffix crash on rotation