am 393631d4: am 3af56b60: (-s ours) Remove duplicate calls to getSortedWidgetsAndShortcuts b/19904873

* commit '393631d4b5600c33bd5ebe4ed21c5a49e6f5f66e':
  Remove duplicate calls to getSortedWidgetsAndShortcuts b/19904873