Merge "Try fixing the flakiness of TaplTestsQuickstep#testSwitchToOverview" into sc-dev