Merge "Fix system_server watchdog timeout" into qt-dev