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

Change-Id: I4df59b7fbe11ae9aa607597ceea5265ee07f3e06