Merge "Update the edit shortcut menu (1/n)." into rvc-dev am: 9eefc0ac am: 42e3a5fb am: 389105c5 Change-Id: I95c5f75ec73e247dd04397938bbc63f37158e736