Merge "Promote stable flicker tests" into tm-dev