Merge "Fix a possible system server crash" into sc-dev