Merge "Fix restoring vertical scroll after horizontal." into rvc-dev