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

* commit '3af56b605217e4ff1c6ed79a70fa49eacaf5b02f':
  Remove duplicate calls to getSortedWidgetsAndShortcuts b/19904873