Merge "Fix TaplTestQuickStep.testOverview for large screen cuttlefish" into sc-v2-dev