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

Change-Id: I5fd43ddc41c28b4f772cf3713b32a8f961f78f81