Fix action execution contexts, use a delay on popup actions to allow the command handler to unwind