Merge "Disable class unloading when tracing is active"