Merge "Fix TabLayout crashing due to using getMaxLines()" into mnc-ub-dev