am b217888b: Merge "Prevent NPE in NavTabScroller" into ics-mr1

* commit 'b217888b48e01cdd92db7efa67d0ba8347c8538d':
  Prevent NPE in NavTabScroller