Revert "Merge pull request #830 from ochameau/tabs-pb"

This reverts commit a9345e76f37155b32dfb8d6d25ea4df5b7f1e18f, reversing
changes made to b0f21bbb646e6e9f2185a467cdec14a7fc73754b.

Part 1 of Bug 848180
Revert "Revert "Merge pull request #830 from ochameau/tabs-pb""

This reverts commit ddf9d7ef04edf4e5eeb0adab680027a8f67c18ed.
Bug 848898: Uplift the changes made by bug 708984 to the SDK repo. r=gozala