Merge "Fix the logic that tracks presence of drawers along edges." into mnc-ub-dev