Merge "Run alignment logic of menu icons when the menu is created" into sc-dev