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