Moved "nowait:" key code to PoolCounter in core

Change-Id: I5286e6c6052289e1107314a04d72703b44a8fbc6
Merge "Moved "nowait:" key code to PoolCounter in core"