Merge "Reset launcher on shortcutconfig activity minimize" into ub-launcher3-master