Perf regression fix

Contains two performance fixes. The regression slipped to the update8. Both changes adapted from overlay-dual-toolbar branch.

Performance regression visible e.g. in http://jolla.com/jolla and transfermarkt.de