Merge "Update the edit shortcut menu (1/n)." into rvc-dev am: 9eefc0ac am: 141a1ae0 am: 4384c443 Change-Id: I81f21d6fe44f3ac3db86dde9c8126b9667f2a415