Merge proposals dependent on lp:~ballogy/overlay-scrollbar/fix-includedir

lp:~ballogy/overlay-scrollbar/fix-includedir has no merge proposals.