Bug 951302 - Fix BasicCompositor handling of mask layers. r=mattwoodrow