Merge "Update edit shortcut dialog measurements and assets." into rvc-dev