Merge "Fix longstanding bug around implicit NPEs and GC, version 2."