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