Merge "Fix NPE in setCustomView() before addTab()" into mnc-ub-dev