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