Merge "Disable flaky app launch flicker tests" into tm-dev