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