am 31a18f1d: Merge "Remove duplicate calls to getSortedWidgetsAndShortcuts" into ub-launcher3-burnaby

* commit '31a18f1d8140cb41a8f0076ff250930c973eca25':
  Remove duplicate calls to getSortedWidgetsAndShortcuts