Merge "Don't animate reorder/add when we're about to collapse." into rvc-dev