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

Change-Id: I2543caa43304590e1f028e483febdfca439e57fb