[master 1/1] Connect scroll adjustments in the right class (#1206472)