Fixed bug in Context switch

After removing the app module layer for Contexts, we forgot to
re-create upon context switch event.