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

Change-Id: I10739d2e1f09827695303f35bd066475eff43b82