Merge "Maybe fix issue #9296868: Crash in system process" into jb-mr2-dev