Merge "Fix ContextImpl leak in ActivityThread." into main