Merge "Fix QS Edit flashing on exit" into nyc-dev