Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: abbb4ee257 am: ac8fd20bfb
Change-Id: Ice5cd4f000564207d94e16a8e1d16471d6073b68
This commit is contained in: