Merge "Fix cropping in docked stack." into oc-dev