Merge "Add waiting OPERATION_STATUS for the third listener in tests."