Merge "CologneBlue rewrite: remove hard dependency on SkinLegacy, kill Quickbar nonsense"