Merge "Fix error source of system server crashes" into qt-dev