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

Change-Id: Ie633b7e7fb0d7c55c5b590865a7301585c9cdd2a