Merge "Simplify lambdas for TestActivity.startSync"