Merge "Prevent system server crash while start activity failed."