Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev