Merge "CologneBlue rewrite: start cleaning up the quickbar code"