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

Change-Id: Iad68ef01e4307dc48023d25ca347dd459410cd9f