Merge "Close overflow when hiding QS editor" into nyc-dev