Merge "Fix QS edit overanimating" into nyc-dev