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