Merge "Add app attribution to QS editing" into nyc-dev