Merge "Fix monitor visit for class initializer"