Bug 895116: Fix masking with BasicCompositor r=mattwoodrow
Bug 894646 - Various dom deCOM cleanups r=Ms2ger