Merge "Fix NPE that happens occasionally on start-up" into sc-v2-dev