Merge "Wait for attachment in Activity syncEngine"