Transition from back to showing widget tray if shortcut/Widget configure activity

was cancelled.

Recent refactoring of the State inside Launcher introduced a check
of which state can show widget tray (only workspace) that was too agressive.

b/21201908

Change-Id: Iaccb44d23485aa101d7720b29335645a74f4dcdc