Merge "Fix flaky testVisibleWithInsetsProvider test"