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