Merge "Fix flaky sysui crash in devicehealthchecks test." into qt-qpr1-dev am: 72be6295c0

Change-Id: I96d2dd32ecdd2af08a454be40efc30eac375b815