Merge "Applies left and right edge scale to side swipe width" into rvc-dev am: 7161e49836 am: 87998f53cc am: ad05a15e09 am: 47bb528079 am: 3b658e8223

Change-Id: I69b63b4f32101b523843c0c57a0439140696c6da