Merge "Add scroll indicators to resolver list" into nyc-dev