Merge "Fix issue #7196015: system_server deadlock during setup wizard" into jb-mr1-dev