Move layout_context into apply_context
3 files changed