Merge "Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything" into lmp-dev