Bug 947093 - [BB] Update toolbar and tab bar building blocks