Merge "Fix QS panel after density changes" into nyc-dev