Merge "Fix QS edit BGs" into nyc-dev