Merge proposals dependent on lp://staging/~gusnan/sakura/sakura-fix-colors

lp://staging/~gusnan/sakura/sakura-fix-colors has no merge proposals.