Move to using the core "nowait:" key code

Change-Id: If769148ed72c469699663f88f18f76300c872580
Merge "Move to using the core "nowait:" key code"