Merge "fixing late hooking of request into deviceContext registry"