Bug 1034167 - Part 1: Update TwoWayView from upstream (r=mfinkle)
Bug 1034167 - Part 2: Explicit set scrollbars in TabsTray (r=mfinkle)