Merge "Fix QS edit state being out of sync" into nyc-dev