Merge "Fix test flake in sysui test suite." into udc-qpr-dev