Merge "Add edit title to QS edit" into nyc-dev