Bug 866567. Mask layers for client container layers. r=mattwoodrow, a=bbajaj