Bug 947093 - [BB] Update toolbar and tab bar building blocks
Merge remote-tracking branch 'origin/bug-947093' into bug-947107
Bug 947107 - [Gallery] Update gallery to use new 1.3 tool bar and tab bars