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