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

Change-Id: If502695e347e44df70d672d728d000ae10dd3e23