Merge "Fix ABL overlapTop behavior" into mnc-ub-dev