Merge "Replace the switch item with the text for multiple shortcut menu." into...
Merge "Replace the switch item with the text for multiple shortcut menu." into rvc-dev am: c463e56a am: 20c4d45d am: 46c63d57 am: 910e5b25 am: af1ee9a5
Change-Id: Ic180daca47f32b67b3f3e83ac4889c88a3ca2e2a