Merge "Fixes the system server crash issue caused by uncatched exception."