Merge "Fix the flaky ActivityManagerHelperTest." into tm-dev