Merge "Fix npe in onStart()" into 24D1-dev