Merge "Fix flaky sysui crash in devicehealthchecks test."