Merge "Applies left and right edge scale to side swipe width" into rvc-dev