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