Merge "Separate out sysui state updating" into qt-r1-dev