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

Change-Id: I87461f0ea1094c3596df09316651b8d5eef97e22