Merge "OneHandedUiEventLoggerTest sometimes flaky" into sc-dev