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