Merge "Revert "Fix name-suffix crash on rotation"" into lmp-dev