Merge "Fix crash on QS edit immediate collapse" into nyc-dev