Bug 947093 - [BB] Update toolbar and tab bar building blocks
Merge pull request #14444 from pivanov/bug-947093

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