Merge "Fix delegate.onStop/onStart not always being called" into main