Possible fix for crashes from ambiguous shortcuts. I have been unable to duplicate the crashes. CCBUG: 375540 (cherry picked from commit a2b6a81b)