Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev