Merge "Fix bug 4521549 - Crash in ScrollingTabContainerView, when using a tab with null text"