Merge "Fix system server restart" into jb-dev