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

Change-Id: Id3fd51e4750b2ee51c827e7593cba799778635b9