Merge "Add shouldForceCollectOp to appOpInfo"