Merge "Remove max displacement threshold in 2-zone model" into ub-launcher3-master