Merge "Move QS Edit into QSContainer" into nyc-dev