Merge proposals dependent on lp:~cimi/overlay-scrollbar/colormap-fix

lp:~cimi/overlay-scrollbar/colormap-fix has no merge proposals.