Merge "Fix a couple issues with sysui state" into qt-dev