Revert b6d6eaa..e78695c

This rolls back to commit b6d6eaad347359b1594663288179fc11c4a55844.
Bug fixing

ok bug seems to be identified.  if app is disabled at the same time as
a client message is to be displayed  the app has unexpected lockups
which cannot be recovered without re-installing