Merge "Removing some obsolete flags" into ub-launcher3-calgary