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

Change-Id: I57d7aed5d88580613b7da9f2d2c31587bf2b4055