Merge "Remove a now uneeded hack for Toolbar theming" into lmp-mr1-ub-dev