Merge "Fix text spacing on rebind." into lmp-preview-dev