Merge "Non-rd variance partition: Adjustments to reduce dragging artifact."