Merge "Fix flaky widget tapl tests" into sc-dev