Merge "Add scroll indicators to QS editing" into nyc-dev