am be6a1611: am 84d2dad0: Merge "Allow for reordering the menu options." into ics-ub-calendar-aqua

* commit 'be6a1611a0f7e2e73e64e33aba769be842db3d29':
  Allow for reordering the menu options.