Merge "Applies left and right edge scale to side swipe width" into rvc-dev am: 7161e498 am: 87998f53 am: ad05a15e Change-Id: I2543caa43304590e1f028e483febdfca439e57fb