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: f2aae1f8 am: 1cd4830e am: 3683c9aa
Change-Id: I9f45464703b95d32875c275e39f4d65f5380b487