Merge "Fix NPE from null runnable" into main