Merge "Applies left and right edge scale to side swipe width" into rvc-dev am: 7161e498 am: d2cda47d am: ceaabbd6 Change-Id: I7f9490d9232ba5275ac1c6c7c1b827a39f896d2a