Merge changes I6cc2507d,I187ea15d into main

* changes:
  Add flag for QUEUE_CALLBACKS_FOR_FROZEN_APPS
  Add a CallbackQueue class