Merge "Fix issue with sysui state flags not being committed" into tm-qpr-dev