Merge "Fix toolbar color for WPP" into ub-launcher3-qt-dev
am: 6f4338c001

Change-Id: Id5dc05442cbd64a4d8a84da9e99fab6b8ec3b1c2