Merge "Disable flaky flicker tests" into tm-dev