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

Change-Id: I89d136105a8fef12590fa4bab417b753efc3bbb6