Merge "Prevent NPE in NavTabScroller" into ics-mr1