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