Merge "Fix Tabs not filling correctly in FIXED mode" into mnc-ub-dev