Merge "Fix the duplicate components in edit shortcut menu list." into rvc-dev...
Merge "Fix the duplicate components in edit shortcut menu list." into rvc-dev am: 22a0b13e am: 084b7b3a am: 80f4dbf6
Change-Id: I226169f42737e17a4643108163f2c562dd805dcf