Merge "Avoid NPE crash system server" into main