Merge "Fix SystemUI presubmit tests flakiness." into sc-dev