Merge "Postpone loading app context until instrumentation is set up"