Merge "Update condition to elevate a sync adapter to ACTIVE." into tm-dev