Merge "Collapse QS panel after details if we expanded it before" into nyc-dev