Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0 am: 4a7ba9a3c9 am: 590754734c am: ee76e109ac
Change-Id: I78d1e135db998e030379a74203bcd8b5b53b7c35
This commit is contained in: