Merge "Guard against NPE in TabLayout" into mnc-ub-dev