Merge "Fixes a bug where the user ends in freescroll state even for regular workspace mode." into ub-launcher3-master