Merge "Only allow scroll in one direction at a time" into rvc-dev