Merge "Revert "Add extra debug to capture system state"" into qt-dev