Merge "Increase the resize edge size to 48dp." into rvc-dev am: bbfdbb8a41 am: 3583974212 am: 65068c55b2

Change-Id: I7b34ad4a78d1d60238737ed4f18a03afea689569