Merge "Fix NPE when pressing ALT key" into lmp-dev