Merge "Started converting Launcher to be gesture-stable" into ub-launcher3-master