am 2a1580ca: Merge "Transition from back to showing widget tray if shortcut/Widget configure activity was cancelled." into ub-launcher3-burnaby

* commit '2a1580ca7d24e4b5dbe815e831332d1dd1d3b392':
  Transition from back to showing widget tray if shortcut/Widget configure activity was cancelled.