Merge "Fix bug with long strings not aligning left on menu items" into 24D1-dev