Merge "Fix npe in onStart()" into main