Update for Sprint 23's new toolbar layout

Inject top toolbar in a way that's compatible with Sprint 23's new toolbar layout (but also backwards compatible with earlier sprints).

Works with inBrowser flag on as well.

@gruehle