Merge "Fixed flaky testTaskChangeCallbacks and promote three tests to presubmit"