Merge "Refactoring One-Handed feature flag and others" into ub-launcher3-master