Merge "Reduce flaky of App Info tests"