Merge "Track window rather than shelf when FeatureFlags.SWIPE_HOME = true" into ub-launcher3-master