Merge "Bug 5161247: More... is aligned with other main menu entries"