Merge "Fix testInflateTabLayoutWithNonTabItem on M+" into mnc-ub-dev