Merge "Remove clipping from QSContainerImpl"